Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 03:36:30 +0000 (20:36 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 03:36:30 +0000 (20:36 -0700)
commit49b18a81a78f93dd442e9b3024af66945010ce50
tree3ffc46d69e83a38eff5085eaad53b5e71c66b7e1
parentb302a57542977105b15c0475c524b4a34d70dda3
parentc93eb3d9846aec2b9c3341d349226576d6136649
Merge from trunk.